Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev