Merge "Camera: fix frame capture trace pair" into pi-dev am: 8d1c940af4
am: 3419ce130b

Change-Id: Id1b3342ec96615919808936fb894c643a2fa2dc8