Merge "sf_foundation: include media_plugin_headers" into pi-dev