Merge "Relocate transition collection around lifecycle events (1/N)"