Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev