Merge "Prevent clipping clock during shrink, bold transition" into qt-dev