Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev