Fixes broken header when the feature widget is hidden in the editor (DT-1286)
Merge remote-tracking branch 'upstream/develop' into develop