Merge "Update max window bounds based on display changes." into main