Merge "Use original BubbleTextView icon for legacy stamped forced adaptive icons." into ub-launcher3-qt-dev
am: a34072b76b

Change-Id: I07744e3d42161236da270e29d88825ff50565f1b