Merge "Fix Magnification CTS on large screen devices"