Merge "Fix some issues with shortcut containers opened inside folders." into ub-launcher3-calgary