Revert "Fix NPE when attach thumbnail"

This reverts commit 37a55752.

Reason for revert: There's one missing part not catch
The below condition should be flipped:
```
if (Flags.moveAnimationOptionsToChange()) {
    options = info.getAnimationOptions();
} else {
    options = change.getAnimationOptions();
}
```

Change-Id: I6e65184a8dce0fb573697d92071aba3a49ab2ac9