Merge "Add strings for quick settings accessibility" into nyc-dev