Merge "Refactor logic to allow touches to use SceneTransitionLayout APIs" into main