Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev