Merge "Disable AssetAtlasService when PRELOAD_RESOURCES is turned off"