Merge "Re-enable r8 optimization in IntentResolver" into tm-qpr-dev