Fix multiline formatting from screen sections

Change-Id: I4ec930999126587e88d3b623aed8b1438de8f076
Fixes: bug 1337374
Merge "Fix multiline formatting from screen sections"