am c59474d2: (-s ours) am ba3d0fd5: am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev

* commit 'c59474d2813be8df40090ca121f9570977796aa7':
  DO NOT MERGE Ensure transient state views are temporarily detached