Merge "Make sure we're obtaining themed drawables correctly" into lmp-dev