* commit '51652f5674e266d62607324255517d41d225d9be': DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
* commit '51652f5674e266d62607324255517d41d225d9be': DO NOT MERGE. Preference activity changes to work on smaller tablet screens.