Merge "avoid resetting framerate during vpx_codec_enc_config_set()"