Fix some UI flow issues when the keystore is locked in WiFi setting.

To make it more user friendly, we need to continue on what
users intend to do after unlocking the credential storage.