Merge "Add bottom offset to the intial padding rather than accumulating it." into rvc-qpr-dev