Merge "Fixes incorrect FromFolderLabelState in clearcut log when updating folder label." into ub-launcher3-master