Fix graphical issues

Change-Id: Iafeb4349fa504b5a5f7d72afd3274581de5b2ddc
Merge "Fix graphical issues" into cm-11.0