Merge "Merge "Camera: fix more image copy/compare logic" into pie-cts-dev am: a1720f0e35"