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