automerge: 61059fe
* commit '61059fe82ca43adcd34ab8f48201a8925dcec164':
Only hide sensitive content when Keyguard is showing
automerge: 61059fe
* commit '61059fe82ca43adcd34ab8f48201a8925dcec164':
Only hide sensitive content when Keyguard is showing