Merge "Fix bug #6029615 Update Javadoc for onPaddingChanged()"