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

Change-Id: I91bc90559f462d622133a018b1217eae10b6e11b