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

Change-Id: I06eb638d76a1223237d7308618c9ad715467519a