Merge "Fix several accessibility magnification issues." into nyc-dev