Merge "Revert "allow all 4 orientations"" into gingerbread