Merge "Fix EmergencyAffordanceService" into rvc-dev