Merge "Relayout when base inner insets change" into oc-dev am: 7f874db5aa
am: 82624f130b

Change-Id: I1bb3642d57f7cbce3813ebb6ae131cad544fb674