Fixed issue with margin appearing on hidden widgets.
Merge branch 'master' into SWC-122