Merge "Add a hidden flag to indicate exif data block." into pi-dev