Merge "Fixing widgets get deteled because of double bind" into ub-launcher3-master