Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev