Merge "UI automation service disconnected upon package change."