Merge "Adding support for highlighting preference in sub-screens" into ub-launcher3-master