Merge "Stop window redraws for invisible parent children"