Merge "Resist SIM logical channel leaking when clients crash"