automerge: 591a091
* commit '591a09131162a32ad5923dc3553a464a5da1d39c':
[Settings] Wifi Setup responds to other connection state change
automerge: 591a091
* commit '591a09131162a32ad5923dc3553a464a5da1d39c':
[Settings] Wifi Setup responds to other connection state change