Merge "Reschedule stop background users if Guest current" into main