Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ics-mr1