Merge "Make framework-tethering stubs use the new defaults" into rvc-dev