Revert "FIX"

This reverts commit 4bca32c0f71f73c45887f3a3fbf6f3416ecedb6e.
Revert "Forward Port Tablet UI toggle"

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

Change-Id: Ib6008d6785d37aed4055460409338b907df4f074