Merge "Permissions to protect socket marking settings"