Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev