UI-2753  Incorrect UI of Add/Edit/View Contact Us content
Merge commit '5a9cc85a244ea00c001975b731c93f23535bc7f3' into HEAD