Merge commit 'c538b651a23287ab25584995c6c4b7a68ece027c' * commit 'c538b651a23287ab25584995c6c4b7a68ece027c': Fix some UI flow issues when the keystore is locked in WiFi setting.
Merge commit 'c538b651a23287ab25584995c6c4b7a68ece027c' * commit 'c538b651a23287ab25584995c6c4b7a68ece027c': Fix some UI flow issues when the keystore is locked in WiFi setting.