Use a view for dividers, to allow shadow to be displayed in background
Merge remote-tracking branch 'origin'