Merge "Replace usages of captureDisplay with captureLayers." into main