Merge "Fix glitchy animation when going from LS to AOD with media" into main