Merge "ExifInterface: Prevent infinite loop" into pi-dev