Merge "Avoid unneeded rect params"