Merge "New API demo showing different screen orientation options." into gingerbread