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

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