Merge "Passing info to RoundedCornerResDelegate directly" into tm-dev