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

* commit '850bca013baf35c99895009e94943f3f127b9e70':
  Only call setHasTransientState in captureHierarchy.