Merge "Add subtext for default keyboard layout." into nyc-dev