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

Change-Id: Ic999b909f9dce05688c6ade6a78e8886f80bb2ee