Merge "Ensure trust agents are disabled in safe-mode" into lmp-mr1-dev