Merge "Listen for additional AOD->* transitions" into main