am d09b9a40: am f4bb763f: Merge "Fix binding editors when state is null" into jb-mr1-dev

* commit 'd09b9a40fc57d76b32b8e7f522b9ed2b192dec96':
  Fix binding editors when state is null