Merge "Minor fixes to animation ApiDemos" into klp-dev