Merge "Fix NPE when trying to access task before AppWindowToken attach to one"