Merge "Fixing crash when window is not attached" into ub-launcher3-master