[automerger skipped] Merge "Don't animate clock when turning screen off." into qt-dev
am:486503c74e-s ours am skip reason: change_id If39777340b72bc623d6690bc4f784c7f5c26ea8d with SHA1dc8fee7ea1is in history Change-Id: I8589586a14b38b70491641f545a31605467f34bd
This commit is contained in: