Merge "All kinds of little foreground services fixes." into oc-dev