Merge "Use correct switch/checkbox ID in accessibility code" into nyc-dev