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