Merge "Rollback and refine compatibility issues for ARC devices" into main