Merge "Add divider support to preference support lib" into mnc-ub-dev