Merge "Change Stack to have generic WindowContainer children (76/n)"