Merge "Do not resolve ActivityInfo in navigateUpTo" into tm-qpr-dev