Merge "Re-work RD modeling based on inter frame prediction residual"