Merge "recovery: Handle EV_SW events"