Merge "Address memory leak in EdgeBackGestureHandler." into main