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

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