Merge "Fix deadlock in MediaCodec::configure when peek default mode is used" into tm-dev