Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev