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

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

Change-Id: I33795a8690e52d26b6f66f991b03b16bdeb665f4