Merge "Reduce overlap of analog clock with smart space." into qt-r1-dev am: 76bf35f6b2
am: 41e4ccabdd

Change-Id: I3f4510c351fea15c0014bc90f7d375ebd6485dd6