Merge "Fix alternative signaling for native handles" into nyc-dev