Merge "Fix disco bounce crash b/30413641" into ub-launcher3-calgary