Merge \"Fix some issues with shortcut containers opened inside folders.\" into ub-launcher3-calgary
am: 2aa31b8fcc

Change-Id: I9659470321eca9bf9c61d74ca0873c2b66a437d3