Merge "Add custom action logging to Chooser." into tm-qpr-dev