Merge "Fix IME sync flicker with 3-button navigation." into tm-qpr-dev