Merge "Fix NPEs in UriPermission." into main