Merge "Allow activities without FLAG_ACTIVITY_NEW_TASK set to be home activities"