Merge "Refactor and add new SceneGestureHandler tests" into main