Merge "snapuserd: Improve EnsureSnapuserdConnected logic."