Merge "screen_ui: Fix an issue when displaying wrapped text."
am: 1d4ef4ba4b

Change-Id: I747fa14c2efaf81dd94cd81171424bff845a43b0