Merge "Make on-screen keyboard settings support tab layout"