Merge "Add a test for overriding task transition"