Merge "Workaround for b/135766310" into ub-launcher3-qt-dev