Merge "Include data scheme when registering for package_* broadcasts." into rvc-dev