am 9a00cbcc: Merge "Update preload list, clean up drawable theming" into lmp-mr1-dev

* commit '9a00cbcc66b5b0002ff78507a1dc1efa12e84d63':
  Update preload list, clean up drawable theming