Merge "Let the foreground service channel be blocked" into oc-dr1-dev