am 17bbdcc5: (-s ours) am 839321a3: am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev
* commit '17bbdcc5':
DO NOT MERGE Check item type before re-binding transient state views