Update native with ui fix.

Fixes #6584.