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

Change-Id: Ibded63bebba40bc29978dee2717dd61a36d609a9