Merge "Added check of ActivityInfo launch mode when starting activity."