Merge "Adjusts measurement for magnification switch and drag handle" into sc-dev