Merge "Properly notify magnification listener" into nyc-dev