Merge "Bug 4957 Role lifecycle support for TxChainManager in DeviceContext"