BZ- 1018273 - Dashboard embedded mode is lost

(cherry picked from commit 1ac0db9a0e1a599e2151622b784b238b1f8231be)