Merge "Fixing activity leak via accumulation of draw listeners" into ub-launcher3-master