Merge "Correct return value of MagnificationController#reset"