am 5009f65c: Merge "Optimize state changes"

* commit '5009f65c9a676b64869e638e08ec0294e20d7e6e':
  Optimize state changes