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

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