Merge "Handle not having main window in createThumbnailAppAnimator." into oc-dev am: 689f41e871
am: 8821015094

Change-Id: I301e6da3064e545d01d54df02ab73bb27fddf5b9