Merge commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021' * commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021': If a window specifies flag to show even when screen is locked, the keyguard is hidden and conversely if the keyguard has been hidden
Merge commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021' * commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021': If a window specifies flag to show even when screen is locked, the keyguard is hidden and conversely if the keyguard has been hidden