Merge "Show disabled trust agents as off." into mnc-dev