Merge "Clean up setForegroundServiceBehavior()" into sc-dev