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

Change-Id: Ib22c951e0e17c90a13b9b4e5697eb5127a1011ba