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