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

Change-Id: I933508014ceecc73434c857bc853e635bb99a691