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