Merge "Remove scrim animation between AOD and OFF" into 24D1-dev