Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev