Fixes in commit: "HALO Changes" we don't have Halo tablet mode support!

Change-Id: I0a45c4668d59583ed46039dc9c061f09098a300d