Update native with UI crashfix and a tweak