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