Merge "Camera: Avoid using an uninitialized physical camera id" into qt-dev am: b902095897
am: 27b8b0b3b5

Change-Id: If3fb8dc6111f79ecba9103bcc1a07d5731caf5a7