Merge "Consolidate TaskDisplayArea#addStack and TaskDisplayArea#addChild" into rvc-dev