Merge "Revert "Unblock the registration of shortcut change callbacks"" into main