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

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