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

Change-Id: Id2b9df26bc9752e10b7ff1a3b981d2721eb747a9