am 0fb0400b: am 8b905e19: Merge "Camera: Set default thumbnail size with matched aspect ratio" into klp-dev

* commit '0fb0400bc54cd1d9ca67f1ba18db1238cded9a50':
  Camera: Set default thumbnail size with matched aspect ratio