Merge "Fix ThemePicker robo test build." into ub-launcher3-qt-dev
am: 29c30a3345

Change-Id: Id54b41c56f075fe54e9b6dc7c1ab7f4cf4c1a91f