Merge "Fix issue #5906017: Missing menu entries in portrait when in compatibility mode" into ics-mr1