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

Change-Id: I54fcc6a340e24beae112fcd5753a1b60bb586c24