Merge "Account for OHM offset during PIP drag corner resize" into sc-dev