Merge "Fix some cts failures due to missing FLAG_ACTIVITY_NEW_TASK."