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

Change-Id: I987d923b923e289baa76d5155cf6a7fe4d9ece6a