Merge "Don't remove OnAlarmListener mappings in the client" into rvc-dev