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