Merge "Add capture args to captureDisplayById" into main