Merge "Fix system hotkey handling." into ics-mr1