am b34b3211: Merge "Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode." into jb-mr2-dev

* commit 'b34b3211e01b0ae946f786b220f73d340159503b':
  Re-introduce single-shot mode, set MS Assist Mode A when in single-shot mode.