Merge "InputSettings: Physical keyboard settings activity." into nyc-dev