[Common] Added PropertyKeyMetadata
[R2D] Fixed layout issues
[R2D] Fixed Shape ScaleXY not taken into account