Fix crash in dual pane

Change-Id: Ie10124c6487db9b7629aa2df05d7972d2add7303
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2
Merge remote-tracking branch 'sgt7/cm-10.2' into cm-10.2-sgt7