Merge "Fix first swipe after exiting AOD" into main