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

* commit 'be22605d1eacfb4137b6984b72a3eda004b911a1':
  Listen for HTTP proxy changes and propagate the information to the media