Merge "Move magnification-relatd stuff to MagnificationController"