Merge "Remove system call to "headless" unbundled chooser" into tm-dev