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