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