Merge "RESTRICT AUTOMERGE Use consistent calling uid and package in navigateUpTo" into pi-dev