Merge "Keyguard - Fix clock in occluded state" into sc-dev