Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f' * commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f': Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f' * commit '90073aadd5dfdbb0e7ca9b53ae086536f976793f': Document that some parameters will not be null and fix getSupportedPictureFormats.