Revert "DO NOT MERGE Ensure transient state views are temporarily detached"

This reverts commit e8d2846fb9bc5f353a3a4af2678932895b7a242f.
To add ListView function, I have to revert commit. If I can commit this again I will re-commit it.