Merge "Added color light/dark theme for lotties" into tm-qpr-dev