Merge "Merge "Remove animation controller" into sc-v2-dev am: 1cb6db3310 am: 95e54713fc"