Merge "remount: Replace ServiceManager::getService with checkService" into main