Merge "Fix NPE in UriPermission." into main