Merge "Improve MediaBuffer robustness for remote clients" into nyc-mr1-dev