Merge changes Ic671bb7b,If5a43f75 into main

* changes:
  Clean-up STLState.finishTransition()
  Change default current scene of test transitions