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