Merge "Fix stray AOD animation" into sc-dev