Merge "Don\'t hide app windows due to not showing when locked when keyguard is...
Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev am: 72c216f2 am: e482eaf6
am: b34e5576
* commit 'b34e5576':
Don't hide app windows due to not showing when locked when keyguard is hidden
Change-Id: Ibfdad91176c0523c23e1a6bedd1e719795e8af79