am 52d378bc: Merge commit \'698997b9ef47f215350f03c0289f291846cd3604\' into lmp-mr1-dev

* commit '52d378bc6bede2c8019134e9c952c14869f226cb':
  Add null check for exif thumbnail size