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