Merge "Follow rename of storeCallComposerPictureAsUser" into sc-dev