Merge "Rename the misleading variable name in setEnabled()" into main