Merge "Fix race condition in removeForegroundServiceFlag" into oc-dev