Merge "Fix override insets when dragging divider in split-screen" into nyc-dev