Merge "Checks that prebundled categories contain only preinstalled contents." into main