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

Change-Id: I264705c629f7d52c2aeb7ae98fbcb1779d068469