Merge "Reduce overlap of analog clock with smart space." into qt-r1-dev