Merge "Limit number of resume controls" into tm-qpr-dev