Merge "Using grantRuntimePermission()" into ub-launcher3-master