Update camera capture resizing to resize only when the size is set
Merge remote-tracking branch 'origin/master'