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

Change-Id: I34cf6e29d2ed39efabca6d43eaccf62763e67693