Merge "Making setActiveOverlay and getCurrentOverlayPackage public" into ub-launcher3-master