Merge "Add Customizable Window Headers aconfig flag" into main