Merge "Fix shadows for preference fragment" into mnc-ub-dev