Merge "Deprecate system/window.h"