UI-3301:  UI-3292 Chat and User Popup
Merge commit 'e8ac40e4c6ed6247dd5e5433aebbc264f35ef9e3' into HEAD