Merge "Deal with display insets when layout splits" into sc-dev