Merge "[Multi-User] Make JobScheduler logic multi-user aware"