Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev