Merge "Update device entry intent on keyguard vis change" into sc-dev