[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev am: 486503c74e
am: 8cd2973a9f -s ours
am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1 dc8fee7ea1 is in history

Change-Id: Ica34780e45dd46847182a4f758244e3285993e12