Merge "Prevent clock-lock overlap with pulsing on AOD." into qt-r1-dev