Merge "Various fixes for MagnificationController" into nyc-dev