am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev

* commit '3c89a2e9d4ee10b9e955783af2ab9e9dd137922f':
  camera3: Don't try to disconnect stream native windows more than once