Camera: don't display picture size unless supported

Otherwise the option will force close when selected

Change-Id: I2047c90ab08e7d7abcf11d817b5ddf106df2c732
merge CyanogenMod

Change-Id: If1fe1f4dd02cc133c6e0f6324bf28ce7de04ce9a
fix merge

Change-Id: Ie6ac6cf34d57fb95bd6ac594297517b43ec06cb2