Merge "Consuming launcher instets in multi-window mode" into ub-launcher3-edmonton