Merge "Update to dynamic resize for 1 pass CBR: source scaling."