am 5c9feadd: Merge "Make sure we\'re obtaining themed drawables correctly" into lmp-dev

* commit '5c9feadd16ce010b0bf34bf23bee92421888255c':
  Make sure we're obtaining themed drawables correctly