Merge "Send broadcast to the correct user in QS restore" into main