Merge "Fix Magnifier position updates" into sc-dev