Merge "Moving section names to model, to avoid an unnecessary hashmap" into ub-launcher3-master