Merge "Skip updating launcher state if it's already destroyed" into ub-launcher3-master