Merge "Ensure the keyguard is force-shown after a power off/on during unlock." into udc-qpr-dev