Merge "Update CameraStreamBuffering test case" into tm-dev