am 2c84e65e: am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev

* commit '2c84e65e87d266a7d9b15a9e6719b9f14137fd45':
  Only call setHasTransientState in captureHierarchy.