Merge "Remove CALL_COMPOSER_STATUS_ON_NO_PICTURES" into sc-dev