Add Options for Tablet Mode

Change-Id: Ic12f96b671baaa318384bd5015f5926a071d9542