[automerger skipped] Merge "RESTRICT AUTOMERGE CCodec: make config consistent before/after flush" into qt-qpr1-dev am: da52cc201e -s ours

am skip reason: subject contains skip directive

Change-Id: I389f96d8174884db937d5bf307b71cb9bc85c6af