Merge "SF: Add a readonly feature flag for display config error HAL changes" into main