Merge "Camera: Set default thumbnail size with matched aspect ratio" into klp-dev