Merge "Add some traces for shell transition"