Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev
am: 9c4b6d3bff

Change-Id: I9ce71c3f2434ef98d91161353c358e65c336e3bc