am 727f0e12: Merge "Set FLAG_ACTIVITY_RESET_TASK_IF_NEEDED for all app shortcuts" into jb-dev

* commit '727f0e1292dccc1916c7e3d54ff70385ae329108':
  Set FLAG_ACTIVITY_RESET_TASK_IF_NEEDED for all app shortcuts