Merge "Fix blank edit view after orientation change."