Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev