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

Change-Id: I4491e0a500d6d08190afd65b1cb09cfc82736b4e