Merge "Fix binding editors when state is null" into jb-mr1-dev