Merge "Rounded corner not align to right on land" into tm-dev