Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev