Merge "Make custom theme remember current selection" into ub-launcher3-master