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

Change-Id: Ic9e346ee1b246a96132b4492423216a54ce92b0b