Merge "Fix some visual bugs" into ub-launcher3-master