Merge "Introduce InputMethodNavButtonFlags" into tm-dev