Merge "Update the rowBytes when reconfiguring to match the new imageInfo." into mnc-dev