am 9c4d52ed: am 09513115: Merge "Camera: disable thumbnail extra check. DO NOT MERGE" into klp-dev

* commit '9c4d52ed10d35dfa24d8243e9b2f88ef812fb47f':
  Camera: disable thumbnail extra check. DO NOT MERGE