Merge "Don't clip preference row icons to padding" into lmp-dev