Merge "Camera: fix frame capture trace pair" into pi-dev