Merge "Turn down the preliminary foreground service API" into oc-dev