Merge "Regression in ag/753709" into ub-launcher3-master