Merge "[aware] Allow privilaged App to set master preference"