Merge "Move rounded corner to provider" into tm-dev