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

* commit '4b60a8d1b8b5f8fd04df5749ce225ed57e0a1a44':
  Added check of ActivityInfo launch mode when starting activity.