Merge "Updated: always show the keyguard on device lockdown" into udc-dev