Merge "Restore app uninstall on cable disconnect during ADB streaming." into sc-dev