Trebuchet: Fix layout on sw320dp devices

Before: http://i.imgur.com/luxulCl.png
After: http://i.imgur.com/Wvk1QQo.png

Change-Id: I22f8bd02e1f135d8f8f062b34429d5230aac71e9
Merge branch "cm-11.0" into kylin