Merge "Separate some elements to set visibility separately" into ub-launcher3-master