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

Change-Id: Id4818ff5e203cb2aa40079ed7af24c4b84a957ba