Merge "Update mInitTouchX when restarting back gesture" into main