Merge "Avoid evaluating constant autoscoll attrib."