Merge "Add an intent redirection consent dialog for Private Space" into main