Merge "Cleanup state properly when interacting during gesture nav transition" into sc-dev