Merge "Use InputSettings in Settings app"