Merge "Waiting until context menu goes away after attempting to close it." into ub-launcher3-qt-qpr1-dev
am: 7c09214298

Change-Id: If209a43004a41ca682473232789810a4d1828521