Merge "Add multiuser and shadow support for call composer"