Merge "SF: Allow debug.sf.hwc_service_name to be fully-qualified" into main