Merge "Update dump in WindowState and WindowFrames to be formatted correctly"