Merge "Remove Enhanced Connectivity Dev Option" into rvc-d1-dev