Merge "Clean up some more refs to thumbnail data" into ub-launcher3-qt-dev am: fad3823420
am: 6dbbf63248

Change-Id: I2df25a57de1054b850b48a326b28080c606a93f4