Fix layout issues in Trebuchet

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