Merge "Fix crash after dequeueNativeBuffer fails"