Merge "Fix issue #3330037: Unnecessary orientations appear..." into honeycomb