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