Merge "Fix up some issues with the onCreateContextMenu example in the Notepad tutorial."