Merge "Fix OHM H/W key shortcut dosn't work appropriately" into sc-qpr1-dev