Merge "Use public API to get padding" into jb-dev