Merge "Don't allow removed DividerView to resize stack" into oc-dev
am: d7427d5d90

Change-Id: I6dfe65d2d3e2c69be14b472dcd3e28389e70655f