Merge "Fix fillwindow destory() throwing IllegalStateException if update is never called."