Merge "Move trust agent toggles to developer options"