Merge "Add snapToIdleIfClose in BaseSceneTransitionLayoutState" into main