Merge "Enable the cached service removal feature by default" into main