Merge "Update API for new key codes."