Fix for white space of wrappers being inherited to content elements

Change-Id: I8ca59ffcd84640eb2c8780e98dbd07624803eb9f