Merge "Clock not centering becuase KeyguardStatusView was disconnected" into main