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