Forward Port Tablet UI toggle
Original Patch by Scott Brady <sbradymobile@gmail.com>

Change-Id: I59fdb13bf0b9556aa88355f44b43feef0db368a4