Merge branch 'master' into changelog-entry-4-drill-typo-master

Author: widatama

CHANGELOG.md

@@ -2,6 +2,11 @@
 Fixes:
 - [active_directory] Fix for reading azure application tenant id from config
 - [core] Set up default headers for common return methods
+- [star-rating] Fix widget close button
+
+Enterprise Fixes:
+- [surveys] Fix widget close button
+
 
 Enterprise Fixes:
 - [drill] Disabling the view user profiles button on drill for queries going to the report manager

plugins/star-rating/frontend/public/templates/feedback-popup.html

@@ -461,7 +461,7 @@
                 try {
                     custom = JSON.parse(custom) ;
                     isFullscreenWidget = !!custom.rw;
-                    isCloseButtonVisible = !!custom.xb;
+                    isCloseButtonVisible = platform === 'Web' || !!custom.xb;
 
                     if (custom && custom.sg) {
                         custom = custom.sg;