Merge "Correctly check bottom padding in setPadding()."