Merge "Fix lost intent extra when starting activity from recents"