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

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

Change-Id: Ib7128e2019536c8570de81b060ae256ffd256a46