Merge "CameraITS: fix unified timestamp tests" into oc-mr1-dev