Merge "Show signal strength indication while in CryptKeeper" into nyc-dev