Merge "Fix DREAMING->AOD animation" into main