Expand Tablet UI to allow selection of Phablet, Phone, or Tablet UI modes [2/2]

Change-Id: I87a203ad05803591f2ead0891dd2cb98fcc395be