Merge "Use consistent calling uid and package in navigateUpTo"