Merge "Camera2: Use Set for physical camera IDs" into pi-dev