Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev