Merge "Do not resolve ActivityInfo in navigateUpTo"