Merge "Fix surface got offsetted twice while entering split" into sc-v2-dev