Merge "Update drawable state after updating tint list" into lmp-mr1-dev