am 14932619: Merge "Correctly apply max width/height to preference icons" into lmp-dev

* commit '14932619ea17d7b224902c50db4d59f15eed7b1c':
  Correctly apply max width/height to preference icons