Merge "Adding missing WindowStackCallback to Window"