Merge "Relayout when base inner insets change" into oc-dev