Adjust layout for readability in different languages

Change-Id: Iddee1ce9b25819711acd01298a4128312f88b0ae
Merge branch 'cm-11.0' into kk_mkt