Merge "Do not send new Intent to non-exported activity when navigateUpTo" into tm-dev