Merge "Make assistant button display the icon of the role holder application" into rvc-dev