am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev

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