Merge "Phase out config_roundedCornerMultipleRadius" into tm-dev