Merge "Pass correct task to window manager"