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

Change-Id: I9c7ac6abb9dc4f5222f2c429b35615ea18028cab