Merge "Fix issues with transitions from AOD and GONE." into main