Merge "Fix issues with delayed transitions"