Merge "Fix issue with z order layering" into ub-launcher3-edmonton