Merge "Fix not persisting activities with FLAG_ACTIVITY_RETAIN_IN_RECENTS."