Merge "added Logic to convert UI key event to shortcut key models" into main