Merge "Fixed typo in ImageView::GetNaturalSize()." into devel/master