Merge "Fix popup container alignment issues" into ub-launcher3-master