Merge "Rename "badges" to "dots" where appropriate" into ub-launcher3-master