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