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

Change-Id: I94ef481f11bdc60c3e0b91b036741acd522adccc