Merge "Refactor MagnificationController out to its own class"