Merge "Delays removal of extra screen when dropping an app." into ub-launcher3-master