Merge "Use Provider for EdgeBackGestureHandler" into sc-dev