Merge "Merge "Add new attribute to support lottie dynamic color" into tm-qpr-dev am: e02788c4c8 am: c72d15dff8"