Merge "Adding workaround for regression caused by ag/752175" into ub-launcher3-burnaby