Merge "[flexiglass] Use transitionState instead of currentScene." into udc-qpr-dev