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