Merge "Refactor encode_rd_sb_row function"