[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c7 am: 8cd2973a -s ours
am: 88c506fd -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7e is in history
Change-Id: I31150cc44df139919be71064008a7e7a325831db