Merge "Exclude insets from new parent config bounds when resolving SCM config" into main