Merge "Fix preference dialog double-creation" into mnc-ub-dev