Add a #define to indicate whether bugfix/nonWindowContexts is merged or not