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

* commit 'f871566adb6a2a1bc5827405712a7ebeb180d9d4':
  Enable adjustViewBounds on preference icon so that maxWidth is used