Merge "Use RoundedCornerResDelegate to read rounded res" into tm-dev