Merge "Revert "Avoiding crash upon pressing Alt-Tab"" into ub-launcher3-master