Merge "Animation tweaks for ambient aod" into main