Merge "Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."" into udc-qpr-dev