Merge "Update keymaps. Bug: 5069142"