Merge "Make SecurityException message consistent for uploadCallComposerPicture." into sc-dev