Merge "Don\'t hide app windows due to not showing when locked when keyguard is hidden" into nyc-dev am: 72c216f
am: c8cd948

* commit 'c8cd9483ea98d07d73be556148c1a44e206278a2':
  Don't hide app windows due to not showing when locked when keyguard is hidden

Change-Id: Ie6487a016af109f9f07c844c48a49f0bc5f96fb0