Merge "Fixes PreferenceScreen padding and scrollbar position." into jb-dev