Merge "camera3: Add camera neutral tag."