Merge "Add FolderInfo label source / Add instance id to snapshot logging" into ub-launcher3-rvc-dev