Merge "Fix lost gesture nav progress on screen rotation." into sc-v2-dev