Merge "Allow null child view when checking whether divider should draw" into mnc-dev