Merge changes I7ad8d0b9,I8afdb13b into udc-dev

* changes:
  Reduce preview height on landscape phones.
  Simplify resource definition for landscape phones.