Merge "Fix some touch issues during gesture nav transition" into sc-dev