Merge "Remove redundant call to window manager addTask()" into lmp-dev