Merge change I9f239766 into eclair

* changes:
  Workaround for 2262578: Don't draw tabs if view is not in the correct orientation for the layout