Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev