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

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