am ec7467b0: Merge "Fix the underlined spinner asset to match text field" into lmp-dev

* commit 'ec7467b019dd2c78e270e87cc76248680677cc4f':
  Fix the underlined spinner asset to match text field