am c620f095: Merge "init: prevent action being added to the action_queue twice"

* commit 'c620f095fef62114ffdc6c0ed0749c56b5e817b8':
  init: prevent action being added to the action_queue twice