msm: HTC: m7: merge display on commands

Change-Id: Ib41307a5d80b4ad92ae8bbe33ad0611e1122656a
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0