Merge "Cleaning up the overlay interface" into ub-launcher3-calgary