Fix UXD for tablets

Change-Id: I94b30c3ac95f7d63f6a33657a324fcc895ed3d45
Merge remote-tracking branch 'cm/cm-11.0' into HEAD