Merge "Use display cutout from proto dump"