Trebuchet: Fix MDPI layout

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I839e6bfa7166dd2e234a5cdbcf53c4eee2abc62b
Merge "Trebuchet: Fix MDPI layout" into cm-10.1
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1