Merge "Fix best ref frame rd cost update in sub8x8 non-RD mode search"