Merge "Revert "Fix clock being clipped in lockscreen after opening notification shade and unlocking"" into main