Merge "Fixed interaction between scale dimensions and bevel percentage properties...