am 78aa50d3: Merge "recovery: Handle EV_SW events"

* commit '78aa50d3499e105d04e37ae3d3d92dad0d2c711c':
  recovery: Handle EV_SW events