Merge "Fix regression with popup refactor" into ub-launcher3-master