Merge "Support preference tidy" into mnc-ub-dev