Merge "Glitchy notifs on clock size change" into main