Merge "Add additional summaries for some restricted switch preferences." into nyc-dev