Merge "Merge "Don\'t hide app windows due to not showing when locked when...
Merge "Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev am: 72c216f2 am: c8cd9483" into nyc-mr1-dev-plus-aosp
am: 21ea5da0
* commit '21ea5da0':
Change-Id: Ic2d8289dcb6f06efdfa4058ea641b0a5b0bd056b