Merge "Change caught exception in MediaScanner when ExifInterface is created"