am a59bf2c5: Merge "Update state only if calls to native window are successful" into jb-mr1-dev

* commit 'a59bf2c58311dfc28f46220383d66869e8f3f57f':
  Update state only if calls to native window are successful