Merge "Move away from deprecated methods in DividerItemDecoration." into nyc-mr1-dev