Merge "Revert "Synchronizing loader preload to avoid launcher getting stuck in loading state,"" into ub-launcher3-master