Merge "Create main activity intents as needed for TaskStackBuilder/Up nav" into jb-mr1-dev