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