Merge "Add unit test for RoundedCornerEnforcement" into main