Merge "Handle transition from multi-window" into ub-launcher3-master