Merge "Fix NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS handling"