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