Merge "Schedule stopping inactive background users" into main