Merge "Fix magnification cutout while performing back gesture" into sc-v2-dev