Merge "Put mediaserver and audioserver in the foreground stune group." into nyc-mr1-dev