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