Merge pull request #16324 from vingtetun/bug969544

Bug 969544 - Toggling the highlighted class of a keyboard key create ref...(cherry picked from commit 6e9b110a7a0c8d99bcfd5ab05b83da6dc44a292a)