am 03544b3f: am 2fa2dfd1: Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev

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