Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev