am 6ef642ca: Merge "Clean up view drawable tinting methods, fix default modes" into lmp-dev

* commit '6ef642ca26e777c13c9a48665ed29e37e599736b':
  Clean up view drawable tinting methods, fix default modes