Merge "Extact Chooser intent processing; remove delegate" into tm-qpr-dev