Merge "Allow preference theming to remove divider." into nyc-mr1-dev