Merge "Clean up some more refs to thumbnail data" into ub-launcher3-qt-dev