Merge "2/n Move task management logic to TaskContainers" into rvc-dev am: 9cb59370 am: 63d727b0 am: 17dfedf4 am: 003c1337 Change-Id: Ic448e097ff52f15248cb21674324f1638150b607