Merge "Fixing use of new API available only on API 24" into ub-launcher3-master