BZ- 1018273 - Dashboard embedded mode is lost

(cherry picked from commit 1260685bae8ff8a8481936f5c333a6d165e8fccf)