Merge "Fix regression from ag/9518396" into ub-launcher3-master