Merge "Ensure that EdgeBackGestureHandler receives all configuration updates" into main