Merge "Update window header spec" into main