Merge "Camera: sort getCameraIdList output" into pi-dev