This fixes it so when you navigate between merge commits, auto merge will be
selected if patchNum is defined.
Also this makes sure that if you have first parent selected in your preference
it won't default to it if patchNum is defined.
Bug: Issue 10670
Change-Id: I732651de5997053252c2c5b07865e05121b242e0