Merge "Consistent names for inter mode probabilities and encodings."