Merge "Fix magnification offset min and max calculation"