Merge "Consider the clock detached if the keyguard isn't visible" into sc-dev