Merge "Always re-enable keyguard state when the user switches." into nyc-dev