Merge "Fix appop tests which use the camera" into sc-dev