Merge "Expand gainmap screencapture:" into main