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