Merge "Moving data sanitization to the end, as it need not block the loading" into ub-launcher3-master