am 5a831eb2: am 42bd0371: am de54ee85: Merge "Fix blank edit view after orientation change." into jb-mr1.1-dev

* commit '5a831eb2945fcfb7538df8ea95573ec1fd3999c9':
  Fix blank edit view after orientation change.