am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev

* commit '46b4920ac85c5294174df9421eb9a69b0c9b5d55':
  Propagate state changes even when we don't change drawable index