Merge "Allow TaskDisplayArea to have TaskDisplayArea children (3/n)"