Merge "Fix improper usage of scheduler exposed by 5c713fdf18f"