Merge "Reduce duration of AOD headsup" into qt-r1-dev