Revert "Revert "Merge pull request #20532 from timdream/keyboard-modify-...

...layout" for most likely causing a really frequent gaia-ui test failure"

This reverts commit 32ffcf9b8e01b350ba26673e6cbd1f61572b3265.