Merge "1/n Move TaskContainers out of DisplayContent class" into rvc-dev am: dddb9dd8 am: 9c09b0c8 am: 1618b76d Change-Id: I1e27050cb518b9f63eb065c127bb90a08605c816