Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev