Merge "Fix mistake using width instead of height."