Merge "Disable trust agent settings when disabled by policy"