Merge "Fixing another reference to Launcher activity after its destruction" into ub-launcher3-master