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

Change-Id: If1ad2d95a354c1b22d52dd219a8cda70c80e0d17