Merge "Cleanup dedicated_device_control_* flags" into main