am 84de722d: am eab674a8: Merge "Fix missing single-step event"

* commit '84de722d553dc6e63d61980bfcf1fd1bab1e5892':
  Fix missing single-step event