Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev