Merge "Add application name to expanded conversation view" into rvc-dev