Merge "Properly handle navigation keys in TIS"