Merge "Update for key frame target size setting."