Merge "Teach hard keyboard settings about correct user ID" into nyc-dev