SWC-1319: set width to 100%, and do not explicitly set height width if we are not scaling
Merge pull request #937 from jay-hodgson/SWC-1319

SWC-1319: set width to 100%, and do not explicitly set height/width if we are not scaling