Merge "Only set userHasDeviceEntryIntent on keyguard" into sc-dev