Merge "HWC screencap portability improvement" into main