Merge "Properly recover vr_wm from surface vr_flinger crashes."