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

* commit 'e910a7ce8b42580b8bc184dfc340859a65e98c80':
  DO NOT MERGE Check item type before re-binding transient state views