Merge "Shortcut Helper - Use physical keyboard id when no id is specified" into main