Merge "Align the size calculation of task configuration" into tm-qpr-dev