automerge: 3c7efdc
* commit '3c7efdc00506e6561ca08933f0b2acf5e3f16b02':
Only hide sensitive content when Keyguard is showing
automerge: 3c7efdc
* commit '3c7efdc00506e6561ca08933f0b2acf5e3f16b02':
Only hide sensitive content when Keyguard is showing