Merge "API refactor: context.startForegroundService()" into oc-dev