Merge "Fix failing test: TaskSwitchingTest.testTaskswitching" into lmp-dev