Merge "PIP: Support accessibility" into nyc-dev