Merge "Add system padding to the bottom of the miniresolver." into main