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