Merge "Fix minor transition bugs"