Merge "Remove remaining references to 'delegate chooser'" into tm-dev