Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev
am: 646038a3c3

Change-Id: I9f6b1b84261d39d2db578011b78c52a516b54bab