Don't ignore explicit dividerHeight of 0 specified in XML

Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15
1 file changed