Merge changes I5810a891,Ic4527a0e into main

* changes:
  Remove fromScene == toScene special handling
  Fix SceneGestureHandler edge cases