Fixing bug where widget could get added to drag layer and not removed (issue 6282757)

Change-Id: Ibc32b48f12e1c37267e140e82e1620bcb407963c
2 files changed