Merge "Assume navigation gesture mode in non-static context" into stage-aosp-tm-ts-dev