Merge "Adjusts the draggable bounds with the display cutcout" into sc-dev