Merge "Remove deleteCaptureDisplay flags" into main