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

* commit '13527b41ba5613cf2861782aafa3b2fd3299bcf2':
  Correctly apply max width/height to preference icons