Merge "SoftAVCEnc/SoftMPEG4Enc: support updated i-frame interval and encoder settings" into nyc-mr1-dev