Merge "Honor password visible setting in CryptKeeper" into mnc-dev