am 1a907db0: am 862c3835: am 4b60a8d1: Merge "Added check of ActivityInfo launch mode when starting activity."

* commit '1a907db07ea105ea65e146713f436ed072d7084b':
  Added check of ActivityInfo launch mode when starting activity.