Merge "Quick pickup triggers AOD2 instead of AOD1" into sc-dev