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

Change-Id: Ia0f581109cffb3a695698537aefc55408287cb45