Merge "Minimal change to ensure events are propagated to the right...
Merge "Minimal change to ensure events are propagated to the right DividerView." into oc-dev am: b1cdc17d am: 87997ce8
am: 53ee05b3
Change-Id: Ia0f581109cffb3a695698537aefc55408287cb45