Merge "Fix keyguard clock view missing" into main