Merge "Refactor JobScheduler to handle user switch via onUserSwitching method" into main