Merge "Fix NPE in ContentProviderHelper." into main