Merge "Don't animate clock when turning screen off." into qt-dev
am: 486503c74e

Change-Id: I18e2ce288e3b7d848a89e440b9fcd0ded1c3ab0d