Merge "Convert (new) ScreenshotController to kotlin" into main