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

Change-Id: Icf91a67467886756cc688e65ee18f89bee5ff5ec