Revert "DO NOT MERGE Check item type before re-binding transient state views"

This reverts commit df262cd922a7f337c50bec441d1d12161f701587.

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