Merge "Fix "The specified child already has a parent" IllegalStateException." into ub-launcher3-burnaby-polish