Merge "Do not remove profile network preference for different uids"