Merge "Remove unused scaffolding for partial shelf overflow" into tm-qpr-dev