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