Merge "Use explicit resource IDs for assist corner radii" into tm-qpr-dev