Merge "Smooth discontinuous height changes to KeyguardStatusViewController" into main