Merge commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c' * commit '0200394a0d8da5fd1a34e7366c1e021db8ccb46c': bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.