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

* commit '862c383530d64e6c493fb519f567dd5778d9d48c':
  Added check of ActivityInfo launch mode when starting activity.