Merge "Simplify ChooserActivityLogger." into tm-qpr-dev