Merge remote-tracking branch 'origin/Sprint74-DV' into Sprint74-DV
BZ-12815 Logo disappears after user select another logo and press 'Cancel' button on the 'Edit Contact Information' pop-up window