Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17dfb am: ebc74796e4
am: 94bbf483e3

Change-Id: I9996b6f19b3558e922e229839f8ae0f52cc7c812