Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev