Merge "Camera: Use short form camera id for conflicting devices" into pi-dev