Merge "Settings ViewPager now correctly handles RTL mode" into nyc-mr1-dev