Merge "Actually relabel emergency affordance"