Tablet detection support

Change-Id: I81d87c1548327de4fd7fd0046f5470a4cc829f4c
Merge "Tablet detection support"