Merge "Update configuration before setting override size."