Merge "Use FLAG_ACTIVITY_TASK_ON_HOME to make sure back button brings user to...
Merge "Use FLAG_ACTIVITY_TASK_ON_HOME to make sure back button brings user to home" into nyc-dev am: 0effee88
am: a73dcf76
* commit 'a73dcf76':
Use FLAG_ACTIVITY_TASK_ON_HOME to make sure back button brings user to home