Merge changes from topic "task-unify"

* changes:
  Merge Task level of window hierarchy (58/n)
  Fix index out of bounds of display removal