Revert "Revert "remove m_desktopContainments""
This reverts commit a122195a378170ed3bb2b118027a4f1c53defdbe.