Merge "Update & re-enable tests for the IntentResolver package." into tm-qpr-dev