Merge "Workaround for corner case in TransitionManager" into klp-dev