Merge "Quick fix from ag/12914139" into ub-launcher3-master