Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev