Merge "Fix redesigned gesture nav jank" into udc-dev