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

Change-Id: Iaddbb28b25642c6128bc8f0705b8f241b42e2071