Merge "Wait for the right handler in TaskPositioningControllerTests"