* commit '5d9e0a1a867aa5b6162a972288cbef41fd68a29b': More preference item visual adjustments for smaller tablets. DO NOT MERGE
* commit '5d9e0a1a867aa5b6162a972288cbef41fd68a29b': More preference item visual adjustments for smaller tablets. DO NOT MERGE