Merge "Temporarily make binding controller no-op for visible bg users" into main