Merge "vp9: Non-rd pickmode: fix logic in reference masking."