Merge "Fix restoring of layer type" into ub-launcher3-calgary