am 8ade1e7b: am a59bf2c5: Merge "Update state only if calls to native window...
am 8ade1e7b: am a59bf2c5: Merge "Update state only if calls to native window are successful" into jb-mr1-dev
* commit '8ade1e7b':
Update state only if calls to native window are successful