Merge "Revert "Handle not having main window in createThumbnailAppAnimator."" into oc-dev