Merge "Cosmetic changes of vp9_nb_mvs_inconsistency"