Merge "Bug 544155: [History Editor] Add option to remember answer to "add to history" prompt" into develop