Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev