Merge "Fix summaries of some restricted switch preferences." into nyc-dev