Merge "remove possible JobScheduler race in cancel()" into lmp-dev