Merge "Changing from EnabledAfter to Disabled for RESTRICT_LOCAL_NETWORK" into main