Merge "Fix ApiDemo for transitions" into klp-dev