am 9390fcbb: am 3e1a9eac: Merge "Import button assets from UX repository" into klp-dev

* commit '9390fcbbc6a7708d49f494dc245e84aaaa9edcc2':
  Import button assets from UX repository