am 69440026: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '69440026':
  Perform an orderly shutdown if possible, force disconnect if necessary
  Remove double negatives from SurfaceMediaSource
  Make sure we still handle shutdown-related message even if we're