Merge "DividerView choreographer set earlier to avoid null exception" into oc-dev