Merge "Add new landscape and portrait orientation features." into honeycomb-mr2