Merge "Refactored whitelist restrict background uids."