Merge "Add JobScheduler support in factor controller"