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 '839321a362ec1cd40fc7267a7883641bcc8ee429':
  DO NOT MERGE Check item type before re-binding transient state views