Merge "Maintain transport connection through package updates" into lmp-dev