Merge "Remove setGeometryAppliesWithResize"