Merge "Revert "Revert "Avoid running RegisteredServicesCache tasks on main thread""" into sc-dev