Merge branch 'release/1.9.6'
Fix crash when trying to change ADB setting.
Update CHANGES.
Update version in manifest.
Merge branch 'release/1.9.7' into stable