Merge "Forward fix/revert of clock detached state on keyguard visibility" into sc-dev