Merge "1/n Move TaskContainers out of DisplayContent class" into rvc-dev