Merge "vp9: Fix condition for disabling noise estimation"