Merge "Fix indent in encode_rd_sb_row"