Merge changes from topic "shell_task_stack_listener"

* changes:
  6/ Fix some flakey issues with dragging to split
  Clean up task stack listeners