Merge "Show a consent dialog for Private Space calls before redirecting to the main user" into main