Merge "Add second ref frame check back in rdcost hist"