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