Resolves: #i91439# copy key modifiers as well

Patch By: hanya
Review By: jsc

(cherry picked from commit 5dfcb178f89532a92b4565739d3445a56abfd095)

Change-Id: Icc593172c0ea2243d9ceffb0a1cd11ec515a137a