Merge "Fix possible NPE in PatchSetSelectBox"