Fix export macro for Windows

Change-Id: I188205bf600cc756e1e471fd5456ddaf09aac7f2
Merge topic 'view-settings' into next

76dd1c91 Fix export macro for Windows