Merge "Cleanup animation layer" into sc-v2-dev