Merge "Add ExpandAllComments checkbox in PatchScreen"