Merge "Support burn-in for all transitions to/from AOD" into main