Merge "Fix supportsNonblockingRead"