Merge "Make the editor in the two-pane activity work"