Merge "Add properties to override size and density"