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

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