Merge "Make showDiffPage() protected"