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

Change-Id: I03cc650cdf98dcd38aed8e7c54148a0bbad88665