Merge "Changing min sdk to 25" into ub-launcher3-master