am b805da9b: Merge "Fix drawable container tinting" into lmp-dev

* commit 'b805da9b592e67cb777b78db3a96d47c60e31ca7':
  Fix drawable container tinting