Merge "vp9 non-rd pickmode: Fix logic in reference masking."