Merge "FramebufferNativeWindow.h is obsolete"